b4457b
@@ -177,7 +177,7 @@
static void registerType(PrimitiveTypeEntry t) {
       Short.class, ShortWritable.class);
   public static final PrimitiveTypeEntry timestampTypeEntry = new PrimitiveTypeEntry(
       PrimitiveCategory.TIMESTAMP, serdeConstants.TIMESTAMP_TYPE_NAME, null,
-      Object.class, TimestampWritable.class);
+      Timestamp.class, TimestampWritable.class);
 
   // The following is a complex type for special handling
   public static final PrimitiveTypeEntry unknownTypeEntry = new PrimitiveTypeEntry(
